do some fix...